63298c78be3f9299e93dcaf89c2eddc7b64a3590,openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/LifecycleServiceImpl.java,LifecycleServiceImpl,closeServiceInstance,#,56

Before Change


                        .getConnectionState()
                        .equals(ConnectionContext.CONNECTION_STATE.RIP);

        roleContext.stopClusterServices(connectionInterrupted);
        statContext.stopClusterServices(connectionInterrupted);
        rpcContext.stopClusterServices(connectionInterrupted);
        return deviceContext.stopClusterServices(connectionInterrupted);

After Change



        // If connection was interrupted and we are not trying to close service, then we received something
        // we do not wanted to receive, so do not continue
        if (connectionInterrupted && !inClosing) {
            LOG.warn("Failed to close clustering MASTER services for node {} because they are already closed",
                    LifecycleServiceImpl.this.deviceContext.getDeviceInfo().getLOGValue());

            return Futures.immediateCancelledFuture();
        }

        // Chain all jobs that will stop our services
        final List<ListenableFuture<Void>> futureList = new ArrayList<>();
        futureList.add(roleContext.stopClusterServices(connectionInterrupted));
        futureList.add(statContext.stopClusterServices(connectionInterrupted));
        futureList.add(rpcContext.stopClusterServices(connectionInterrupted));
        futureList.add(deviceContext.stopClusterServices(connectionInterrupted));